Cleaned external stuff