remove dependency on p.a.contentypes at all. pep8
merge