Cleaning up setup