Refactored: removed unnecessary references to Project