Removing all empty(PMA...) checks