Removed non-testable files, commented out some 'TODO' lines