Finally got rid of redundant files