Extensions cleanup

Self explanatory