Cleaned out some unused things