Removed more uneeded and old stuff.