Cleaned out some nonsense