Post PSR-4 & Beta Clean ups