Improved deleting, clears instead of removes