Remove data cleaning function, add cmdline flags, change final cluster classification method