Removed moustrap dependency