removing non-used code