prop fixed, remove comments