Removed dependencies currently not being used due to latest refactoring changes