Fixed infinite loops and removed properties