Cleanup
Cleaned up, removed unnecessary compatibility shims