cleaning up setup...