* clean up stuff from work, prep for patch for server