Updated project dependencies + Clean Up