Revert "Lotta changes"

This reverts commit 965b0b54e67c823eac81baff9cf86cc2f55261af.