Removed a lot of junk