Clean up

took out defaults, removed callback from pages that don't need it