Clean up - removed all global definitions