Remove lines causing bug