commented out the remove lines until I figure out what's going on