Cleaned up some left over comments