remove optimalization