Cleaning up initial setup.