Spring cleaning ... Phone Demo stuffs