Refactoring to use upstream modules
Removed old file