Revert "Merge and cleanup"

This reverts commit 38b0b2a6f9fc05e874be66b3c8f2a5de72497cde.