Removed unecesarry sync and partitioning