Clean up plugin api
Sonar inspired cleanup
FASTTRAVIS