remove old stuff

remove first function calls, because classes work now