removed dead code; addressed compiler warnings