covert to partials and remove extra @import calls