Removed commented codes