Removed un-used code