Removed a lot of redundant stuff.