Removed all references to any framework.
Removed all references to any framework.
Fixed merge errors.