changed url and cleanup