Revert some hacky code in previous commit, not needed
Fix previous commits