cleanup. some stuff works, some stuff doesnt