Code efficiency

Just removed a lot of code that isn't required.