Removed unused old things