Restructure new hotlink functionality

Removed much absolete code.