clenup on general stuff