Removed some other peoples e2 and updates