Minor refactoring
Removed conflicting dependencies already brought in by misaki