Removing old-code