[#WIZ-41] Reduce common components to minimal set