Removed test stuff