Removing needless code elements again