Remove unneeded code & files, fix cancel button