Further cleanup of code.