Cleaned up some shit in CoreCmd