Removal of more non-functional code.