Clean-up

Moving unnecessary stuff to different projects.