Some clean up, broke other things