Cleanup/cleanup code2 latest version #249

Closed toddskinner closed 9 years ago