diff --git a/src/bpm/main.go b/src/bpm/main.go
index e44c0e8..c34eb84 100644
--- a/src/bpm/main.go
+++ b/src/bpm/main.go
@@ -876,6 +876,12 @@ func resolveFlags() {
 				return
 			}
 			subcommandArgs = removeFlagSet.Args()
+		} else if getCommandType() == cleanup {
+			err := cleanupFlagSet.Parse(subcommandArgs)
+			if err != nil {
+				return
+			}
+			subcommandArgs = cleanupFlagSet.Args()
 		} else if getCommandType() == file {
 			err := fileFlagSet.Parse(subcommandArgs)
 			if err != nil {