Fixed disable/remove/file loading