Clean up obsolete code