removing redundant, deprecated logic