Removing one more dependency