cleanout more code