Removed testing features causing bugs.