Removed unused project and code refactored