Removed commented out code-snippets