clean out more code