Cut up useless options & code