Removed commented portions