Removed unused things etc