further cleanup and removal of unused packages