Remove ifs for testing