clean up unused code and feature