duh and removed un used code