Cleaning up stuff that will not be used for now.