Cleanup to get system going on Ubuntu 13.10