Remove feature conflict and unneeded module