remove warning + some comments