Removing junk lines; Closes #5