Cleanup, added .pbw