Cleanup, added registerView