removed unused lines, some coder cleanup