remove grid and refactor