removed @Properties in some places