removed obsolete file
fix various formatting issues