cleaning up and removing false main methods