Cleanup for 1.6 after finding bugs in mvn