deleted some lines for cleanup