Remove/replace Ubuntu-specific commands