Revert "Cleaned up a few things from last merge"

This reverts commit 0460cac7b3423f97d0621d0f1f98449df5fbe4c3.
Reverted to a known working commit

There was a huge meta file corruption which broke my entire project,
reverting back to when it was working