Remove unnecessary files, source the right ones
Remove uncommented code