Split source files
Remove outdated comment