Fixed requires dependencies to align ordering of plugins
Removed unused file