First attempt to cleanup