Removed OSX componenets, added aliases and functions