Removed unused code
Removed factory reference
Removed unused code
Removed unused factory
Code formatting
Code formatting