Synthesis refactoring:  Remove obsolete code