Dev/performance

remove before merge