Cleaning up to prepare for extjs development