Removed outdated functions