remove superfluous methods and give booleans sensible logic