Removed unused snippets & cleanup.