Big commit but it's just more cleanup