Removed legacy code
Simplified API