Removed filewalk & simplified lists