Removed methods which haven't been tested