Removed unused vars, see #10