Removed all POP support