Revising core components
removed temp files