Few fixes and removed commented parts.