Removed unecessary methods as discussed in the Pull Request