Get rid of unused system.c + formatting