removed various important declarations for clean up
removed various important declarations for clean up