remove horrible things and some unused ones