remove Common.cpp
more const