cleanup & added settings profile