got rid of unnecessary target class stuff