clean code :: to remove those remains