Cleaned unused code
Changed school name by university name