did some cleanup, started on login