Fix project red issues and remove redundancies.