Removed code specific to UCSD