removed unused file
Some more polish, removed compiler warnings