Removed unnecessary declarations from main pkg; improved load time