Remove non-used code