Code clean up @ todo bypass fucntionality