Removing old project - Refactor part 2