removed a bunch of unused code to clean it up a bit