Cleaned out a bunvh of unused stuff