Additional project clean-up