Remove/rename some Epi stuff (don't help the evil students xD)