Removed old null and nil