removed some testing features