Clean up project more