removing configurability code