Removed uneeded methods according to codeReview1