rev2

removed more stuff