Framework fixes: removing no framework related responsabilities