ok remove reduntant stuff