Removed yaml stuff since it was proven inefficient