Checked everything is linted, removed two redundant files