removed unnecessary methods (finish)