removed memory warnings