Cleanup of redundant non-functional code.