Removed obsolete statements, minor fixes