Attempting to clean up, included unused codes and test code..