moved cleanup methods
Better handling of pride failures, nullpointers still occur sometimes appearently