Big cleanup - removed spf13 stuff