Big code cleanup and temporally reverted to old URL