Cleanup Locksmiths and make XpEliminator simple

Thanks to @Sanctum32