removing cruft code