Minor changes and removed legacy codelines