Removed unusued parts, updated 2 database entries for .org