Removed dependencies on namespace std