removed some stupid code