Refactoring
Remove record plugin from core