Remove unused src
More cleanup