cleaned up post-setup (the return was unnecessary)