Clean up

HP methods moved