removed pycs
removed some more
merge