Removing annoying dependencies