Cleaning up the code, removing obsolete snippets.