Cleanup and adding st2