Cleaned out stupid code