Got rid of session, cleaned up autostart