finished cleanup. RSS2014 with latest development