Removed unnecessary file and updated more code

see title