Removed imports of old functions