general cleanup, prepparing for 14.04 release