Cleanup of redundant code.