removed two unused and dodgy methods