Cleaned up setup.