cleanup, move utils to common