Removed dependencies on pu stuff