clean up everything, simplify