paring down some unnecessary / obsolete code.