Clean up, switch to Anjuta