cleaned up code, nuked some stuff