Removed a bunch of stuff which is not needed.