Fixed Warnings

Removed more unnecessary code.
Added additional implementation of input.