Settings changed and some gateway files removed