Removed leftover functions