Removing the extra methods from dev-master and ensuring the method signatures match the signatures in the interface