Commented more not used code