Add cleanup also in homepage