Conforming to P2

Also removed AJAX setting from Subclass