cleanup and configuration fields