Remove unneeded files and updated code a bit