Cleaning up code after clean 14.04 installation