Cleaned up some unused codes and files