Removed some unused things