Unnecessary debugging parts removed