Improve admin and delete unneeded field