Whoops. Forgot to delete Commands.cs after merging it with the main file