Fix silly errors and deleted redundant files