Cleanup.
Added things to implement.