Remove mailpv and general cleanup