Cleaned out some unused stuff