removed a lot of stuff