fixing PEP8
removes old-fixture code
removes old-fixture templates