cleaning up unnecessary stuff and updated framework