175 Clean up obsolete code