general cleanup of maps code (removal of tabs, docs, etc)