Removed some redefinitions