Removed superfluous changes, name changes, commented code, etc.