removing un-used code