20140916 - Freemix cleanup