Code cleaning: Removed odd properties