Cleanup, removed old lines which are not needed
anymore