Removed save handling from component