Removed obsolete datetime column + minor cleanup