Added remove / recreate / clear methods + code improvements