Simplify the project a bit