removing cruft from codebase