Removed a lot of useless stuff