cleaning up for "main" view