cleaned up not used stuff