Minor bux fix in exam, cleaned up some useless code