cleanup include
change init for pn544