Start moving code for servers out of mcfs.
Remove unused package and variables.