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