Removed code that was necessary when using PData