Removed dependencies on Critical Edition module