Remove a dependency, implement Maverick Hunter X support