Removed some stuff and switched over to using the std library.