removed old and stupid code