Removed redudent setup class