CLeaned up support for buildroot