Moved cleanup_title with other static method
More date overrides