Removing two obsolete code snippets