Removed cruft code