Removal of un-needed imports and added todo