General fixes: Added missing imports and commented out code not being used
Merge pull request #49 from ChocoShell/master

General fixes: Added missing imports and commented out code not being us...