Properties removed and some fixes