Remove dependencies for Gotham support