merge fixes for ALOY-632 and ALOY-633
removes platforms directory