Removed memory errors