Remove non-functional code around storage locations