Removed 2 eduactor functions