Removed unecessary imports, added a to do note