Finished up cmdr, removed some unnecessary js