Removed some TODOs
Removed unused factory function