Removed absurd circular dependency