Another attempt to cleanup