Spring Clean

No more experimental stuff :)