Cleanup

Remove redefined and once warnings