remove more code