removed Activator specific code
Removed unncessary code