removed more code that has been migrated to other modules