Removed a lot of extra stuff