removed duplicated methods. cleaning