Cleaned up dependencies across generators