Clean up & linaro