Cleaned up ObjectCommandHandable stuff