Removed some unnecessary, duplicated methods.