Removed unused methods etc.