java7 marker and template clean up