Deleted unused/useless old code. Will re-add if needed