Clean up gross code