Took out useless imports, combined notes