Enhancement: Upgraded to no hashtag if it can, removed unneeded files