Fixed some dialyzer warnings
Cleanup.