manual clean up failed attempts of refactoring