Removed not used checking
Code style fixes