Cleanup refactor

Delete some old functioncs
Fix ibuffer pattern

fixes #12 on github