development: removed cruft code