Revert "BadAss Insertion and some cleanup :)"

This reverts commit 3a59f4f082375e0d185df2a170fb060220af496d.