Cleanup in preparation for new features