#311 - Remove duplicate properties