Removing Metro and backbone dependency