Remove more code around storage locations