Removed dependencies on admin file