@@ -105,7 +105,6 @@ func (s *TagStore) ImageExport(names []string, outStream io.Writer) error {

 	return nil

 }

-// FIXME: this should be a top-level function, not a class method

 func (s *TagStore) exportImage(name, tempdir string) error {

 	for n := name; n != ""; {

 		// temporary directory

@@ -14,7 +14,6 @@ import (

 // ParseHost parses the specified address and returns an address that will be used as the host.

 // Depending of the address specified, will use the defaultTCPAddr or defaultUnixAddr

-// FIXME: Change this not to receive default value as parameter

 func ParseHost(defaultTCPAddr, defaultUnixAddr, addr string) (string, error) {

 	addr = strings.TrimSpace(addr)

 	if addr == "" {