Cleanup by removing old packages and fixing a controller reference bug.