some cleanup and schema work