Outcommented some unushed code