removing legacy copy and paste