Closes #26. Remove unneeded methods.