removed redundant #defines and declarations