Remove unnecessary nil