removing unused lines and fixes data modal