remove unused header files
shuffle admin context around