[WFLY-3324] Ensure the POJO's are removed for custom handlers

Cleaned up the removal process a bit and ensure POJO's are removed from ```custom-handler```'s