Clean sources & actions
Clean sources & actions