removing unnecessary parts