cleaning up old files

Cleaning up old file and some changes in GUIs