removing some PS code